This repository has been archived by the owner on Oct 2, 2022. It is now read-only.
Allows use of out-of-order revision numbers #44
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…revision IDs with multiple developers, branches, ...
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We kept running into issues of merge conflicts between developers working on different branches while trying to use a sequential revision model.
This patch allows developers to use revision numbers which may be out of order by recording the revisions which have been applied and comparing this to all the revisions present. Developers can then use any appropriate revision number such as a combination of issue number and timestamp to track revisions which can be later merged together.
It does not attempt to resolve conflicts between different revisions, that's left as a task to the user.
When used on an installation with the former concept of revisions, it will initially load the revisions in the same way the previous version did; then it saves this using the new concept.